Fix for #1301764