Fix build take 2