adaptions for Foreman 1.5