Fixed bug in call; not fixing bug in return because we don't have enough time