Fixed bad return variable references