One more fix for 20141225