Use indexOf to clean up disable check