Issue #111 fix