Fix for yuan and yong