OnRightWay's conditions fixed