Fix Issue #49

Fix issue: #49