brought Chris' change to master