Merge pull request #462 from imrehg/posfix