Fixing scenario that was failing