better fix for #56