Fix bug in Create Screen