Fix to use file default values