creator bugfix