Attempt at fix for 2863