fix for #525