Fixed Issue #144