issue-1963 - fixed import order