Fixed #500