Fixed #148, remove the hardcoded XTS
Merge from origin master