add 5.8, 5.18: I'm told these work now :)