bugfix and live example