proper fix for #13