bugfix and new binding structure