bugfix + kleine performance boost