YASME-960 #comment Added possible fix