Fixed #32 in 0a1892.