Bugfix to remove undefined value warning