Minor improvement for status monitoring