Fixing #114.