Fixed Issue #154