JAL-2788 corrected merge error in propertyChange