Fixed #599