part of #37  fix