fixed #649