TODUN: removed the demo code.
template for fix added.