Fixes declarative order