Fixed some logic.