part of #34