Fixed the bug fix