MSL 3.2.1 changed the initialization, changing it back locally