Real fix for issue #1