Fixed the problem with key not found thing