Fatal bug fix