tp #547
quick fixes tp 547 implementation bug