#31: Post-merge fix.