Stephen is right — this needs to be fixed.