Patch Number: 3

solution for issue #83