One more fix in works