Merge pull request #270 from svost/useless-cast