Fixed botched merge