option fix
associated command fix
fix in template create