Better fix for issue #4.