reduce code(get parameter)
bug fix