Fix for #1094