Fix build correctly