Changed order - prefer own packages