Fixed creation issue