Fix unsynchronized/wrong code that appeared on conflict
Merge pull request #1688 from ojeda/boostfix

Fix unsynchronized/wrong code that appeared on conflict