Vital bug fix