updated pull request based on discussion in mailing list