Fixing one big problem