Fixed #1581