- fix for #362