Fix hashish resolving