fixed #590