bugfix and index reloaded