Make sure to include final tokens into composed command