Fixing the previous mess