Fix for boost >= 1.55