Fix for latent bug ...