Fixed the almost catastrophe