Fixed problem with add and subtract