Repaired bug from "Added files from David"