fixed #828