issue #590