Fixing "all-" classes