Added fix from #672 & #673 to CHANGELOG