Fix handling of normals