Drop #1065662 by @ParraDeSys