Fixed some operation stuffs