Fix: still working on C++11 compat