Added a bug fix