Issue #240 , fix scenario