Temporary fix for 'next' link