Proposed fix for issue #25