BugFix: Error on creation fixed