Early Boost fix

This commit fix the issue posted here: https://svn.boost.org/trac/boost/ticket/7506