Fixed bug fix during feature 5