fixed #924