Fix for U4-5564
Merge pull request #492 from Bitmapped/7.2.0

Fix for U4-5564