fix from Peter S.