Fix for #5.