fixed broken things from last changeset