Fixing BDD context