fixed Greg's commit