fixes iss2622 and another