Drop #1035732 by @ricardotakamura