Better fix for issue #3