Fixed returning too early for cannon checking.