Incremental step towards removal of bug for claim4 example