Fix values pushed to calc