issue #112 part 2 fix