Fix for #25