Fixing 504