Hotfix: Elaine's fixes
98883556c195c076127e84f319025e6f59b18938