One more fix for the last change