work on #1258