New in #139

New in #103