@Saaman Could you include this fix as a separate commit while working on #371?