Fixed according to changes in parent projects.