Merge pull request #1834 from Ansuel/fixpo