Fix for disabled NEXT button-create case