Fixes: #1964 Fixed composite required check