some controller fix