Patch Number: 6

Solution for issue #87