AE: Adding a bug fix that I should have committed a while ago