Finally fixing bug #762.