Removed the if statements again to test whether or not they are causing the H12 errors