Fix double return at end