Fixed bug with continue option