A fix for issue #936