issue #112 part 20 fix