1.58.11.0

Fixed redundant ifs.