A fix for issue #30