Good point, changed to this mechanism with e4820ce