juandelperal fixed OT bugs