Fixed Issue #151