Bug fix compose.