Fix double return