Fix to pick the default values properly
Documentation of the options