Preliminary fix for issue #175.