Emergency fix - 2.7.5