Added context to fix misbehaviour