fix for #17