actually make cms robust (trim trailing L)