I added #972 for this