Fixed Issue #159