Fixed botched merge in last commit