Fix for #1156