Fixing #25.