fixes subissue of #37