v5.8.38 - hackfix github issue #38 until I have time to implement a
proper solution