from commit 24176a6bdd8f26040a97960868fd0d9ee968d695 Tested on 22.03.5 Signed-off-by: Paul Donald <newtwen@gmail.com>