Fixed #811.