Fix for option continue
Use parameters instead of kwargs