Originally proposed in #27
Originally proposed in #27