Drop #1167034 by @HugoFaz