Merge pull request #3821 from maxonfjvipon/bug/#3820/to-phi-removes-as

Merge pull request #3821 from maxonfjvipon/bug/#3820/to-phi-removes-as #1542