bug fix
actived feature