lekrus

unfortunately this fix didn't work for me: had issues with stopping listener and also it was not possible to do a restart after an error, something is wrong with changes...