Fix issues created by previous PR

sorry!