Fixed build properly