fixed composition errors