Sorry about the second update, another quick fix of fixed calc