Fix the object case (hopefully without breaking anything else)