Paddle portion of the fix for #17.