Abstracting bug from 2.3.0 I think