Fix for #2.