readded change from PR #100 lost during PR #103