Fixed issue related to custom widgets