Minor reliability improvement