Drop #1141835 by @ParraDeSys