Fixed bug from imports in last set of commits