Fix for #27