Bug fix with bug fix :P