Fixed #590