Shashlyk bug fix 3

Fix problem causing crash in Shervin's tests