Fix for #1000