Patch #233 (manually applied)