Fixing #8