Fix form end when no options passed