doh, fixed components check