Fixing #2.