Code fix (10/27)

Code fix