25 fixed bug with master and input