working on #582