Merge pull request #2383 from henghonglee/fix-dyn