Fix for #1083