fix as proposed by email from Andre