Bug fix as per e-mail