Change the math calculation, so no need to use dummy key anymore