Fix for fatal error.
Merge pull request #1001 from sylus/7.x-1.x

Fix for fatal error.