Fix creation issue