Fix for SZ-36 (trivial enough that could be lumped in here)