Fix for #303.