Fixed creation bug