Yes, please do fix this before merging - we need to keep this cut n pasted component block out of trunk