bugfix and behaviour change