Bugfix. Performance up