Changed build order :astonished: