Attempt at fixing #1873, #1360