issue close #23

+ logic of @extension changed