Bug fix aligned with reflection project