Fix for WATER letter spacing and double free bug