#32 also fixing all edit text available