Fix #109. This seems to work.
Update PBO. RC2.