Fixed ECCE's PONTOON and Magnus Olsen's MASKEN