fixing Patrick's mistakes -WB