Merge "Fixed the crash caused by type mismatch" into nyc-dev