Fix previous Typo and add a further fix