working around FELIX-4450