Yet another array fix for Yuriy
Merge branch 'boss_ginger'