Simplify fix and add entry to a changelog