Proper fix for ESBJAVA-3158