fixed iss39