The fix of thomas has been pushed to git by accident but has been reviewed by schubi