Fixes ordered attributes problems