Typo fix from merged branch