Fixed #714