Fixing the whole mess