Fix some logic again