fixed #653