work on #1366