better fix for #57