Fix up calc