Improved previous fix as suggested. (nw)