Merge pull request #2 from 30x/XAPID-1040

fixed XAPID-1040