Bug Fixed #3