Fixing everything ...