Eric fix branch

forgot to include this.