add this post fix for xs code
merge from github