A fix for issue #25