Fixes july 8