Fixed problem with cuke scenarios.