Little fix
Merge pull request #1871 from KreizIT/3.6

Little fix