Fixed checking as far as I can tell