better fix for #5