FIX: Usage of c++11 feature