added exception for komodo and