Fix for integer surface forms