Proper fix for issue #3 (last one didn't compile!