I'll change that when #854 is merged