Possible fix for component mismatch, specs need fixing