Note that this is a bug fix