issue #112 part 3 fix