Safety commit. May be similar to the last one.