Bugfix
small optimization