Finally fixed #8