Fix to recent merge