Fixed bug
bug squashing