Fix for CPP-68