Fixed #2 Bug
Revert "Fixed #2 Bug"

This reverts commit c7da3509933310b3d39dd807ed5652276d8c31c4.
Revert "Revert "Fixed #2 Bug""

This reverts commit e110120612cda19829b4fc397e955e963aac12fb.