Fix to work with Reika's PR