Patch Number: 5

Solution for issue #87