A better solution for fixing #1619