fixes #2679
Merge pull request #2691 from FinalAngel/support/2.4.x

fixes #2679