Work for #1109