Fixing for #25