Commit fix from Peter Jensen