Fixing 'next' problem