Fixed bad return