bugfix and indent