fixed #496