Bug fix the bug fix