Fixed 3.9a, 3.12