-- code improvement for MTE-18