[TASK] Bugfix for 6.x