Fixed

Replaced imageSurface with just surface so that it is consistent