A fix for issue #31