Fix? Untested, as always...