Still Trying to fix broken objects