Simplified component construction fix