Fixing #16.