Use template which accounts for empty rhs
Merge pull request #405 from cmc333333/404-rhs

Use template which accounts for empty rhs