bugfix and ship