Fix building attempt 4