I don't know if we need this locking to 2.*? Any reason for that?