Fixed Compose-Bug