Fixed #431