fixed issues with option 5 not being handled