fix failing senarios