Fixed retirn problem