Apply uncommited fix from Ace to fix line numbers