Still working on the bug fix