(Salamander) Fix bug