fixing a bug in the fix for ODE-302.