Fix for #13.