Bug Fix complete

Bug Fix complete