Fix logic of @import

Fix logic of @import #962