I think it's an easy fix also for this PR.