Bug fix for Derek's eagle eye.