fix with handling arguments