Finally solved this one. Will be fixed in 3.5.2