Likely fix for issue #21