work on #918