One more patch for the develop stack