fix fix for FLEX-34454
Added bug fix

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>