Fix for CPP-70