Fix to #1668