Fixed Issue #149