additional checking related to issue 17186