fix for #530