Workaround for Eff bug