#1131 fixing build after split-up