Fixing self remembering problems stemming from lib change.