Separate build and check, second try, #10