fixed #837