Proper fix for #2