fixed issue with calcs