fixing imports
fixing error related to this-assignment