fixed #521