2017-09-09_fix for 3rd pull (2)