Oops! ...this fixes last two commits