part of #117