Fixed #656