Bugfix with indexOf