Fix for solution building