bugfix
perfmance tuning! :)