Fixed creation performance bug