fix controller arguments handling