Fixed pivotal story #63037576