Fix calc command to its full potential