Re-applying earlier fix