Further improvement on #16