Added bugfix