bugfix and style fix