Fix after Shakespeare upgrade