Fixed Issue #15
Fixed Issue #15