Fixed #548