re #138 - improvements