Fixed #932