Bugfix and optmize