Fixed mathx issue