A fix for issue #23