Proper fix for issue #2