Better fix for issue #135.