merge and fix for set_default