comment solution for bug AND-197