Fix for is optional on all components in block