For issue #590