fixed #623