Fixing #9