Minor improvement to the bad handling of item locations