Fixed issue #201 in 1.2 branch