bugfix and extensions