Make build green

finally after hours of fighting the build should be green!