fixed iss #87