Address Emma issue.