Fixes the bug introduced by most recent merge; all is well