unsupported fields code modified