Better version of bug fix

Less confusing