Update fix from Colin feedback