modifications all merged into one (for test #197)