fix part of #31