More proper fix for what I previously thought was a C++11 issue...