Fix for #1.