fixed parser for module import ...