Double checking for any bugs everyone else missed

Double checking for any bugs everyone else missed