Fixed Issue #155