A fix that is better than #950.