Fix for new objects