Fix for #622 (Cucumber infinite loop)