Fixed JGRP-1834