fix problem with calc
speed