This addresses regression discussed in #8129 Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>