add fix for C++03 pt2