fixed composite properly