fixing some scenarios