Fix for objectcreation generators