fixing code to avoid boost conflicts