Issue #225 and #226 default params