Fixes key bug regression