bugfix and merge