Addresses https://github.com/mjordan/pkppln/issues/2; needs testing.