Solution for build