Changed to not deprecated key?
Shotgun surgery fixed