Bugfix - removed redundant text field usage