Merge pull request #1179 from jkoelker/p9_fix