changed path resolution order