fix for #499.