Bugfix: now runs ok (not slow)