Fix #1123