Small simplification
Add workaround for problem in composite widget