Better solution for feature request 1908061