#7 re-fixed old fix that apparently got lost.