Adding in bug fix