[BUGFIX] Improve 6.2 compatibility