Fixed breaks introduced with Parameter Objects