internal import issues, fixed #26