Fixed #987