bug fix and elmination of inappropriate warning