Helping out on #1275