Merge cucumber fix