A probable bugfix for issue #8