Fixes

Bug fixed