keys and default options fix