Part of #199