partially fix act-1873
fix test cases for act-1873
Merge pull request #223 from smirzai/act-1873

Act 1873