more fixing to md5 catches