Improvement on #101