Apply selkhateeb pull request to solve igrigorik issue 18