Fixes predependency and execution order