Proposed fix for issue #213