Fix performance issue, updated changelog