Error fix by pcmerc.
Merge pull request #575 from nZEDb/dev

Error fix by pcmerc.