2017-08-26_fix for second pull