Follow git rev: cf18e5578f85bc6c368a2ad4d7c746af8687c7f0
This fix bug: 8430

Sorry for this I forgot this in my revert...

Thanks to Playtester