Bugfix
Improved performance