Fangfang's rait -new fix