fixing composition after aspect mapping impl