Fixed object loading (again?)