Fix problem on #calculate