Bugfix to ensure the first item is always the current