Bugfix for performance issue with laptop mission