Frontend bugfix