[FIX] Fatal error.
Merge pull request #497 from intportg/dev

[FIX] Fatal error.