This will improve the code coverage metrics, and this also fixes a few potential bug, where the Modifier was used several times.