New attempt to fix issue #28.