fix and make build solution