Proper fix for #569