Fix for #957 - Line of code is to long, cannot be read
Merge pull request #958