Fix on inputs method calls and values