fixed forgotten the
fixed the missing ?
fixing more things
made fixes elz suggested
a
Merge pull request #1365 from otwstephanie/3574

issue 3574