Fixed faulty double return