Fix Compose