fixed #530