Major bug fix fixed for real this time