Amends fix from previous commit