JGRP-1898 Fixed partially applied change
Merge pull request #181 from nekop/JGRP-1898-3.4

JGRP-1898 Fixed partially applied change