Slightly scary change to fix issue 426