possible problem merge 17h50