Comparator stuff 2

Just do this to prevent those comparator shenanigans :D