Fix for #1084