Fixed issue #2762 (already fixed in 2.0m1)