Issue #130 - Fix