Better fix as proposed by wasawi