Fix for overriding column_family