#487 - Cherry picking @farfromrefug solution