Fixed issueas mentioned by Mathieu Champlon during Boost review