before fixes July 11