Finally, fixed #7