make template more robust, correct indent
make template more robust