bugfix and build