Prevent information disclosure bug