Fixing everything finally