Fix palette dropping
Merge