Fixed Issue #2
Fixed Bug