bugfix, performance boost