v6.2.4 should finally fix this bug