Might help on #986