tinyows fix last merge