creator bugfix2