Fix Issue #54
Fix Issue #55