Fixed solution build