Fixed the Bug to end all Bugs