fixed #604