#337 extra check to be super safe