fixed #564