Proper fix for #575