Fix for #1063