Addendum to #561 - further problems with auto_item adding.