sounds reasonable. / #5815

I changed the code, as you suggested. I am not sure, why I used the old check, but it was obviously not a good idea.