better fix for #50