Fix a problem with new mechanism