Bug fix for #25