Attempt fix for issue #221