Proper fix for #42