Proper fix for #235