Fix Issue #3

Fix Issue #3