Removed the bug entirely, instead of just avoiding it.