fix wrong order
refactoring