Now compatible with 6.2