mods for issue #112, part 2