Solve build problem