Drop #1171592 by @HugoFaz