fix for #500