Proper fix for #193