Added fixed bug fix