Fix importing from master