bugfix and fwd