Fixed bug fix