always add modify flag to answer
Merge branch 'hotfix/0.4.4.1'