Better fix for the boost 1.56 issues