issues #415, issues #416