Fixed #811