part of #296