issue#112 part 1 fix