Code fix for shape operation