Fixing #7