Fixed Issue #4
Fixed Issue #4