Proper fix for #429