basically fixed #9