Fix build, take 3