Fix for code not working in parallel any more
Authored by: paulatz 2019-06-21
Parent: [r484]
Child: [r486]