fix bug master template (on progress)