fixing imports for #536