Fixing import components