Fixed additional cases