[Bug#10] Ported 2.x to 3.3