A few missing "SWMAX" ... (confer issue #334)