Trying to fix surface issue