Fixing #18.