RMCS CAP Fix