Fixed Issue #130