Merge pull request #1552 from pandamicro/develop

Refactor #3985: Correction of bug