Fix earlier fix