another part of #34