Maybe this composer bit will fix it?