Minor improvement (potential bug fix)