Fix #6, upgrade to new composition operator