move the disable to the right place(?)