Bug fix for Niels' eagle eye.