lhn spinny fix (against s37.2, conflict resolved)