Will work on top of pull #988