somd fix from last merge