Fix for broken objects