work on #318